Merge branch 'MDL-59473' of https://github.com/sytabaresa/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Aug 2017 02:46:39 +0000 (10:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Aug 2017 02:46:39 +0000 (10:46 +0800)

Trivial merge