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

Trivial merge