Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 16:45:58 +0000 (12:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 16:45:58 +0000 (12:45 -0400)

Trivial merge