Merge branch 'MDL-58691-master' of git://github.com/ankitagarwal/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Apr 2017 03:25:35 +0000 (11:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Apr 2017 03:25:35 +0000 (11:25 +0800)

Trivial merge