Merge branch 'MDL-56543-master' of git://github.com/ankitagarwal/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 3 Jan 2018 01:26:12 +0000 (09:26 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 3 Jan 2018 01:26:12 +0000 (09:26 +0800)

Trivial merge