merge 2.4.14 into master

Didn't create a release branch for this change but also want to dump git-flow to conform to community standards.