Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 15:52:44 +0000 (11:52 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 15:52:44 +0000 (11:52 -0400)

Trivial merge