Merge branch 'MDL-58904-master-fix' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 12 May 2017 07:19:07 +0000 (08:19 +0100)
committerJun Pataleta <jun@moodle.com>
Fri, 12 May 2017 07:49:02 +0000 (15:49 +0800)

Trivial merge