Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Dec 2016 17:26:36 +0000 (12:26 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Dec 2016 17:26:36 +0000 (12:26 -0500)

Trivial merge