Merge branch 'hotfix/1.0.4' v1.0.4
authorIan Weller <ian@gaslightmedia.com>
Tue, 13 Dec 2016 17:39:10 +0000 (12:39 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 13 Dec 2016 17:39:10 +0000 (12:39 -0500)

Trivial merge