Merge branch 'MDL-59832_master-fix' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Aug 2017 07:44:24 +0000 (15:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Aug 2017 07:44:24 +0000 (15:44 +0800)

Trivial merge