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