Merge branch 'MDL-34627_master' of https://github.com/dmonllao/moodle