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