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