Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Sep 2014 18:33:52 +0000 (14:33 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Sep 2014 18:33:52 +0000 (14:33 -0400)

Trivial merge