Merge branch 'hotfix/1.0.4' v1.0.4
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 18 Jun 2015 21:05:14 +0000 (17:05 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 18 Jun 2015 21:05:14 +0000 (17:05 -0400)

Trivial merge