Merge branch 'MDL-55352-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 08:30:33 +0000 (09:30 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 08:30:33 +0000 (09:30 +0100)

Trivial merge