Merge branch 'hotfix/1.0.4' 1.0.4
authorIan Weller <ian@gaslightmedia.com>
Thu, 20 Apr 2017 16:20:20 +0000 (12:20 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 20 Apr 2017 16:20:20 +0000 (12:20 -0400)

Trivial merge