Merge branch 'MDL-28574-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Aug 2017 01:59:59 +0000 (09:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Aug 2017 01:59:59 +0000 (09:59 +0800)

Trivial merge