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