Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 8 May 2015 20:51:52 +0000 (16:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 8 May 2015 20:51:52 +0000 (16:51 -0400)

Trivial merge