Merge branch 'MDL-59890-master-fix' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 5 Oct 2017 03:00:47 +0000 (11:00 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 5 Oct 2017 03:00:47 +0000 (11:00 +0800)

Trivial merge