Merge branch 'MDL-55320-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 14:20:17 +0000 (15:20 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 14:20:17 +0000 (15:20 +0100)

Trivial merge