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