Merge branch 'MDL-58311_master' of https://github.com/sk-unikent/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 10 Apr 2017 04:00:59 +0000 (12:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 10 Apr 2017 04:00:59 +0000 (12:00 +0800)

Trivial merge