Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 16:52:15 +0000 (11:52 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 16:52:15 +0000 (11:52 -0500)

Trivial merge