Merge branch 'MDL-52840_master' of https://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Dec 2016 05:01:31 +0000 (13:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Dec 2016 05:01:31 +0000 (13:01 +0800)

Trivial merge