Merge branch 'MDL-50469-master' of git://github.com/junpataleta/moodle