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