Merge branch 'release/1.0.4' v1.0.4
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 4 Sep 2015 16:14:52 +0000 (12:14 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 4 Sep 2015 16:14:52 +0000 (12:14 -0400)

Trivial merge