Merge branch 'MDL-58906-master' of git://github.com/ankitagarwal/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 24 Jul 2017 10:22:43 +0000 (12:22 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 24 Jul 2017 10:22:43 +0000 (12:22 +0200)

Trivial merge