Merge branch 'hotfix/1.0.7' master v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Apr 2017 21:02:47 +0000 (17:02 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Apr 2017 21:02:47 +0000 (17:02 -0400)

Trivial merge