Merge branch 'MDL-60914_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Sun, 3 Dec 2017 23:50:06 +0000 (12:50 +1300)
committerJun Pataleta <jun@moodle.com>
Sun, 3 Dec 2017 23:50:06 +0000 (12:50 +1300)

Trivial merge