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