Merge branch 'MDL-69698-310-licensecache' of git://github.com/mudrd8mz/moodle into...