Git commits in Moodle 3.5.18 by Chris Brown

commit d49ba78dbd8864b460a98b3f7107dedea85b9d5d
Author: Chris Brown <chrisb@moodle.com>
Date:   Thu, 18 Mar 2021 17:31:56 +0800
Tag:    v3.5.18

MDL-71139 trademark: Improve the trademark messaging