Merge branch 'hotfix/1.0.14' v1.0.14
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 27 Aug 2018 20:36:39 +0000 (16:36 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 27 Aug 2018 20:36:39 +0000 (16:36 -0400)

Trivial merge