Merge branch 'MDL-58929-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 May 2017 11:07:13 +0000 (12:07 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 May 2017 11:07:13 +0000 (12:07 +0100)

Trivial merge