Merge branch 'hotfix/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 18:06:12 +0000 (14:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 18:06:12 +0000 (14:06 -0400)

Trivial merge