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