Merge branch 'MDL-56637-master' of git://github.com/dpalou/moodle