Merge branch 'wip-MDL-62755-master' of git://github.com/abgreeve/moodle