Merge branch 'hotfix/1.0.14' v1.0.14
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 13 Jun 2018 17:48:54 +0000 (13:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 13 Jun 2018 17:48:54 +0000 (13:48 -0400)

Trivial merge