Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 2 Oct 2015 19:58:08 +0000 (15:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 2 Oct 2015 19:58:08 +0000 (15:58 -0400)

Trivial merge