Merge branch 'MDL-58032-master' of git://github.com/ankitagarwal/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Feb 2017 03:45:30 +0000 (11:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Feb 2017 03:45:30 +0000 (11:45 +0800)

Trivial merge