Merge branch 'MDL-54562_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jun 2016 08:17:49 +0000 (09:17 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jun 2016 08:17:49 +0000 (09:17 +0100)

Trivial merge