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