Merge branch 'MDL-62283-master' of https://github.com/Kathrin84/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jun 2018 02:36:37 +0000 (10:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jun 2018 02:36:37 +0000 (10:36 +0800)

Trivial merge