Merge branch 'MDL-37153_master' of https://github.com/pauln/moodle