Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 17:59:13 +0000 (12:59 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 17:59:13 +0000 (12:59 -0500)

Trivial merge