Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 11 Apr 2018 17:23:02 +0000 (13:23 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 11 Apr 2018 17:23:02 +0000 (13:23 -0400)

Trivial merge