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