Merge branch 'MDL-70120-assign-stamp-expires-MOODLE_310_STABLE' of https://github...
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 6 Nov 2020 01:26:01 +0000 (09:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 6 Nov 2020 01:26:01 +0000 (09:26 +0800)

Trivial merge