Merge branch 'MDL-49701' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Aug 2015 14:14:15 +0000 (15:14 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Aug 2015 14:14:15 +0000 (15:14 +0100)

Trivial merge