Merge branch 'MDL-52138-master-take4' of git://github.com/lucaboesch/moodle