Merge branch 'MDL-55367-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 13:25:38 +0000 (14:25 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 13:25:38 +0000 (14:25 +0100)

Trivial merge