Merge branch 'hotfix/1.0.7' master
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 22 Nov 2016 15:03:44 +0000 (10:03 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 22 Nov 2016 15:03:44 +0000 (10:03 -0500)

Trivial merge