Merge branch 'MDL-61133-master-fixes' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 8 Feb 2018 04:01:55 +0000 (12:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 8 Feb 2018 04:01:55 +0000 (12:01 +0800)

Trivial merge