Merge branch 'MDL-57569-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 27 Nov 2017 06:43:32 +0000 (19:43 +1300)
committerJun Pataleta <jun@moodle.com>
Mon, 27 Nov 2017 06:43:32 +0000 (19:43 +1300)

Trivial merge