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