merge 2.4.14 to master

Didn't make a release branch for this one but planning on not doing git-flow going forward as is the standard with nearly every community cookbook.