Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Jun 2018 18:32:55 +0000 (14:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Jun 2018 18:32:55 +0000 (14:32 -0400)

Trivial merge