Merge branch 'master' into devel and apply fixup from Stephen Rothwell: