Merge branch 'MDL-59677-master-fix' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Aug 2017 07:58:42 +0000 (15:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Aug 2017 07:58:42 +0000 (15:58 +0800)

Trivial merge