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