Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Jun 2018 14:56:34 +0000 (10:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Jun 2018 14:56:34 +0000 (10:56 -0400)

Trivial merge