Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 16:21:22 +0000 (11:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 16:21:22 +0000 (11:21 -0500)

Trivial merge