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

Trivial merge