Spring cleaning
Merge branch 'master' into 4.2