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