Merge branch 'hotfix/2.0.4' v2.0.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 1 Jun 2016 18:46:47 +0000 (14:46 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 1 Jun 2016 18:46:47 +0000 (14:46 -0400)

Trivial merge