Merge branch 'MDL-37800_master' of git://github.com/grabs/moodle