Merge branch 'MDL-46768-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 28 Nov 2017 04:18:54 +0000 (17:18 +1300)
committerJun Pataleta <jun@moodle.com>
Tue, 28 Nov 2017 04:18:54 +0000 (17:18 +1300)

Trivial merge