Merge branch 'MDL-35849-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Sep 2017 13:18:51 +0000 (14:18 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Sep 2017 13:18:51 +0000 (14:18 +0100)

Trivial merge