Merge branch 'MDL-71779-master' of git://github.com/ferranrecio/moodle