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