Merge branch 'm20_MDL-26176_cleanup' of github.com:danmarsden/moodle