Merge branch 'MDL-37966' of git://github.com/jonof/moodle