Merge branch 'MDL-53169-master' of https://github.com/sammarshallou/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 19 Sep 2017 14:26:30 +0000 (22:26 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 19 Sep 2017 14:26:30 +0000 (22:26 +0800)

Trivial merge