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