Merge branch 'MDL-54963_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jul 2016 12:38:36 +0000 (13:38 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jul 2016 12:38:36 +0000 (13:38 +0100)

Trivial merge