Merge branch 'hotfix/1.0.4' v1.0.4
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 11 Dec 2015 21:49:00 +0000 (16:49 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 11 Dec 2015 21:49:00 +0000 (16:49 -0500)

Trivial merge