Merge branch 'MDL-60758_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 10 Nov 2017 04:21:15 +0000 (17:21 +1300)
committerJun Pataleta <jun@moodle.com>
Fri, 10 Nov 2017 04:21:15 +0000 (17:21 +1300)

Trivial merge