Merge branch 'hotfix/1.0.4' v1.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 20 Jan 2017 15:38:13 +0000 (10:38 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 20 Jan 2017 15:38:13 +0000 (10:38 -0500)

Trivial merge