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

Trivial merge