Merge branch 'MDL-57270_32' of git://github.com/markn86/moodle into MOODLE_32_STABLE