Merge branch 'MDL-50935-master-2' of https://github.com/junpataleta/moodle