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