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