:Merge branch 'hotfix/1.0.4' 1.0.4
authorIan Weller <ian@gaslightmedia.com>
Fri, 6 May 2016 12:22:10 +0000 (08:22 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 6 May 2016 12:22:10 +0000 (08:22 -0400)

Trivial merge