Merge branch 'MDL-58906-master' of git://github.com/ankitagarwal/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 26 Jul 2017 12:42:38 +0000 (14:42 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 26 Jul 2017 12:42:38 +0000 (14:42 +0200)

Trivial merge