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