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

Trivial merge