Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 26 Sep 2017 13:51:24 +0000 (09:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 26 Sep 2017 13:51:24 +0000 (09:51 -0400)

Trivial merge