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

Trivial merge