Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 15:46:27 +0000 (11:46 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 15:46:27 +0000 (11:46 -0400)

Trivial merge