Merge branch 'MDL-60720-master' of https://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 8 Nov 2017 16:27:15 +0000 (17:27 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 8 Nov 2017 16:27:15 +0000 (17:27 +0100)

Trivial merge