Merge branch 'MDL-59106_master-fix2' of git://github.com/dmonllao/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 12 Oct 2017 02:54:47 +0000 (10:54 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 12 Oct 2017 02:54:47 +0000 (10:54 +0800)

Trivial merge