Merge branch 'MDL-47166-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE