Merge branch 'hotfix/1.0.14' master v1.0.14
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Aug 2018 12:31:55 +0000 (08:31 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Aug 2018 12:31:55 +0000 (08:31 -0400)

Trivial merge