Merge branch 'MDL-59367-master-fix2' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Jul 2017 06:03:22 +0000 (14:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Jul 2017 06:03:22 +0000 (14:03 +0800)

Trivial merge