Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Nov 2016 16:11:21 +0000 (12:11 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Nov 2016 16:11:21 +0000 (12:11 -0400)

Trivial merge