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