Merge branch 'hotfix/1.0.4' v1.0.4
authorIan Weller <ian@gaslightmedia.com>
Wed, 6 Jul 2016 16:43:04 +0000 (12:43 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 6 Jul 2016 16:43:04 +0000 (12:43 -0400)

Trivial merge