Merge branch 'hotfix/1.0.4' v1.0.4
authorIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 19:09:51 +0000 (15:09 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 19:09:51 +0000 (15:09 -0400)

Trivial merge