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