Merge branch 'MDL-53222_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Jul 2016 10:42:41 +0000 (11:42 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Jul 2016 10:42:41 +0000 (11:42 +0100)

Trivial merge