Merge branch 'release/1.0.4' v1.0.4
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 27 Sep 2016 20:33:45 +0000 (16:33 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 27 Sep 2016 20:33:45 +0000 (16:33 -0400)

Trivial merge