Merge branch 'hotfix/1.0.5' master v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Aug 2018 20:50:56 +0000 (16:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 21 Aug 2018 20:50:56 +0000 (16:50 -0400)

Trivial merge