Merge branch 'hotfix/1.0.14' master v1.0.14
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jun 2018 12:26:19 +0000 (08:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jun 2018 12:26:19 +0000 (08:26 -0400)

Trivial merge