Merge branch 'hotfix/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 16:03:52 +0000 (12:03 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 16:03:52 +0000 (12:03 -0400)

Trivial merge