Merge branch 'MDL-38570-master' of https://github.com/timgus/moodle