Merge branch 'hotfix/1.0.4' v1.0.4
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 21 Dec 2015 19:02:18 +0000 (14:02 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 21 Dec 2015 19:02:18 +0000 (14:02 -0500)

Trivial merge