Merge branch 'hotfix/1.0.12' v1.0.12
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 18:13:52 +0000 (14:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 18:13:52 +0000 (14:13 -0400)

Trivial merge