Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 18 May 2017 13:45:32 +0000 (09:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 18 May 2017 13:45:32 +0000 (09:45 -0400)

Trivial merge