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