Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 9 Sep 2015 20:56:14 +0000 (16:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 9 Sep 2015 20:56:14 +0000 (16:56 -0400)

Trivial merge