Merge branch 'hotfix/1.0.4' v1.0.4
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 1 Dec 2015 20:23:38 +0000 (15:23 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 1 Dec 2015 20:23:38 +0000 (15:23 -0500)

Trivial merge