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