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