Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Mar 2015 19:05:23 +0000 (15:05 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Mar 2015 19:05:23 +0000 (15:05 -0400)

Trivial merge