Merge branch 'MDL-60637-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 21 Nov 2017 03:12:26 +0000 (16:12 +1300)
committerDavid Monllao <davidm@moodle.com>
Wed, 22 Nov 2017 12:24:30 +0000 (13:24 +0100)

Trivial merge