Merge branch 'hotfix/1.0.4' v1.0.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 10 Jun 2016 20:56:23 +0000 (16:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 10 Jun 2016 20:56:23 +0000 (16:56 -0400)

Trivial merge