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