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