Merge branch 'MDL-59671-master-fix' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Aug 2017 07:09:08 +0000 (15:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Aug 2017 07:09:08 +0000 (15:09 +0800)

Trivial merge