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