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