Merge branch 'MDL-55808_master' of git://github.com/juancs/moodle