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