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