Merge branch 'hotfix/2.4.2' v2.4.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Mar 2017 15:39:26 +0000 (11:39 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 17 Mar 2017 15:39:26 +0000 (11:39 -0400)

Trivial merge