Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 9 Jan 2015 15:39:29 +0000 (10:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 9 Jan 2015 15:39:29 +0000 (10:39 -0500)

Trivial merge