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