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