Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Dec 2016 18:07:15 +0000 (13:07 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Dec 2016 18:07:15 +0000 (13:07 -0500)

Trivial merge