Merge branch 'MDL-58957-master-fix' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Jul 2017 04:58:27 +0000 (12:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Jul 2017 04:58:27 +0000 (12:58 +0800)

Trivial merge