Merge branch 'MDL-58754-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE