Merge branch 'MDL-49811_master' of git://github.com/jinhofer/moodle