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