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