Merge branch 'hotfix/1.0.4'
authorIan Weller <ian@gaslightmedia.com>
Wed, 20 Apr 2016 19:52:18 +0000 (15:52 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 20 Apr 2016 19:52:18 +0000 (15:52 -0400)

Trivial merge