Merge branch 'MDL-68647-master-forumprivacysql' of git://github.com/mudrd8mz/moodle