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