Merge branch 'MDL-60538-master' of https://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 25 Oct 2017 13:08:49 +0000 (15:08 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 25 Oct 2017 13:08:49 +0000 (15:08 +0200)

Trivial merge