Merge branch 'MDL-57139-master' of git://github.com/danpoltawski/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 7 Jun 2017 06:36:13 +0000 (14:36 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 7 Jun 2017 06:36:13 +0000 (14:36 +0800)

Trivial merge