Merge branch 'MDL-41587_master' of git://github.com/dmonllao/moodle