Merge branch 'MDL-69419-310' of git://github.com/andrewnicols/moodle into MOODLE_310_...