Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 2 May 2018 20:39:11 +0000 (16:39 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 2 May 2018 20:39:11 +0000 (16:39 -0400)

Trivial merge