Merge branch 'MDL-50632-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 May 2017 08:55:34 +0000 (09:55 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 May 2017 08:55:34 +0000 (09:55 +0100)

Trivial merge