Merge branch 'MDL-54566_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 May 2016 06:27:06 +0000 (14:27 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:07 +0000 (17:16 +0800)

Trivial merge