Merge branch 'MDL-59602-master' of https://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Aug 2017 05:04:33 +0000 (07:04 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 2 Aug 2017 05:04:33 +0000 (07:04 +0200)

Trivial merge