Merge branch 'MDL-61949-master-privacy-upgrade-txt' of git://github.com/mudrd8mz...
authorDavid Monllao <davidm@moodle.com>
Thu, 10 May 2018 15:53:05 +0000 (17:53 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 May 2018 15:53:05 +0000 (17:53 +0200)

Trivial merge