Merge branch 'MDL-62315-34-privacycoreform' of git://github.com/mudrd8mz/moodle into...