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