Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 11 Dec 2017 13:48:42 +0000 (08:48 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 11 Dec 2017 13:48:42 +0000 (08:48 -0500)

Trivial merge