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