Merge branch 'MDL-61309-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 May 2018 00:03:17 +0000 (02:03 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:17:31 +0000 (09:17 +0800)

Trivial merge