Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 19:57:58 +0000 (14:57 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 19:57:58 +0000 (14:57 -0500)

Trivial merge