Merge branch 'MDL-58196-master' of git://github.com/ankitagarwal/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Jul 2017 07:17:49 +0000 (15:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Jul 2017 07:17:49 +0000 (15:17 +0800)

Trivial merge