Merge branch 'MDL-60598_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Sun, 5 Nov 2017 21:18:46 +0000 (10:18 +1300)
committerJun Pataleta <jun@moodle.com>
Sun, 5 Nov 2017 21:18:46 +0000 (10:18 +1300)

Trivial merge