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