Merge branch 'MDL-55287_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jul 2016 14:55:48 +0000 (15:55 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Jul 2016 14:55:48 +0000 (15:55 +0100)

Trivial merge