Merge branch 'hotfix/1.4.8' v1.4.8
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 11 Oct 2016 19:38:47 +0000 (15:38 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 11 Oct 2016 19:38:47 +0000 (15:38 -0400)

Trivial merge