Merge branch 'MDL-54542-master-fixup' of https://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 May 2016 02:56:50 +0000 (10:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 May 2016 02:56:50 +0000 (10:56 +0800)

Trivial merge