Merge branch 'wip-MDL-30582-m20' of git://github.com/samhemelryk/moodle into MOODLE_2...