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