Merge branch 'MDL-57611-master' of https://github.com/jebarviabb/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 15 Aug 2017 03:49:38 +0000 (11:49 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 15 Aug 2017 03:49:38 +0000 (11:49 +0800)

Trivial merge