Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 15:28:51 +0000 (11:28 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 15:28:51 +0000 (11:28 -0400)

Trivial merge