Merge branch 'MDL-70067-master_theme_classic' of https://github.com/alexmorrisnz...
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 12 Nov 2020 02:26:30 +0000 (10:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 12 Nov 2020 02:26:30 +0000 (10:26 +0800)

Trivial merge