Merge branch 'MDL-59638_master-fix' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Aug 2017 05:41:29 +0000 (13:41 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Aug 2017 05:41:29 +0000 (13:41 +0800)

Trivial merge