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