Merge branch 'MDL-54620_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 May 2016 04:04:20 +0000 (12:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 May 2016 04:04:20 +0000 (12:04 +0800)

Trivial merge