Merge branch 'MDL-29327_none_23' of git://github.com/andyjdavis/moodle into MOODLE_23...