Merge branch 'MDL-52708' of https://github.com/ramdesh/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 May 2016 07:49:48 +0000 (15:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 May 2016 07:49:48 +0000 (15:49 +0800)

Trivial merge