Merge branch 'MDL-60187_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 20 Nov 2017 08:33:00 +0000 (21:33 +1300)
committerJun Pataleta <jun@moodle.com>
Mon, 20 Nov 2017 08:33:00 +0000 (21:33 +1300)

Trivial merge