Merge branch 'hotfix/1.0.10' v1.0.10
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 17:38:15 +0000 (13:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 17:38:15 +0000 (13:38 -0400)

Trivial merge