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