Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Nov 2015 15:51:16 +0000 (10:51 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Nov 2015 15:51:16 +0000 (10:51 -0500)

Trivial merge