Merge branch 'MDL-50911_master' of git://github.com/StudiUM/moodle