Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Apr 2015 20:32:30 +0000 (16:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Apr 2015 20:32:30 +0000 (16:32 -0400)

Trivial merge