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