Merge branch 'MDL-42711-master' of git://github.com/nebgor/moodle