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