Merge branch 'hotfix/1.4.7' v1.4.7
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 11 Oct 2016 19:32:27 +0000 (15:32 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 11 Oct 2016 19:32:27 +0000 (15:32 -0400)

Trivial merge