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