Merge branch 'MDL-60522-master' of https://github.com/Kathrin84/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Oct 2017 00:12:31 +0000 (08:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Oct 2017 00:12:31 +0000 (08:12 +0800)

Trivial merge