Merge branch 'MDL-56646-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Aug 2017 07:51:01 +0000 (15:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Aug 2017 07:51:01 +0000 (15:51 +0800)

Trivial merge