Merge branch 'MDL-57704-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 May 2017 02:35:46 +0000 (10:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 May 2017 02:35:46 +0000 (10:35 +0800)

Trivial merge