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