Merge branch 'MDL-40179-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Aug 2015 12:40:15 +0000 (13:40 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Aug 2015 12:40:15 +0000 (13:40 +0100)

Trivial merge