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

Trivial merge