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