Merge branch 'hotfix/1.4.2' v1.4.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 18:42:53 +0000 (14:42 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 18:42:53 +0000 (14:42 -0400)

Trivial merge