Merge branch 'MDL-58991-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 14 Jun 2017 08:56:11 +0000 (16:56 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:32:02 +0000 (12:32 +0100)

Trivial merge