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