Merge branch 'MDL-50273-master' of git://github.com/danpoltawski/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 30 May 2017 11:21:35 +0000 (19:21 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 30 May 2017 11:21:35 +0000 (19:21 +0800)

Trivial merge