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