Merge branch 'hotfix/1.4.6' v1.4.6
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 11 Oct 2016 16:57:57 +0000 (12:57 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 11 Oct 2016 16:57:57 +0000 (12:57 -0400)

Trivial merge