Merge branch 'MDL-28501-310' of https://github.com/mackensen/moodle into MOODLE_310_S...