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