Merge branch 'MDL-54859_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Jun 2016 03:00:28 +0000 (11:00 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:05 +0000 (09:04 +0100)

Trivial merge