Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 25 Oct 2017 15:20:03 +0000 (11:20 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 25 Oct 2017 15:20:03 +0000 (11:20 -0400)

Trivial merge