Merge branch 'MDL-32350-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 5 Dec 2017 22:31:16 +0000 (11:31 +1300)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:35 +0000 (19:53 +1300)

Trivial merge