Merge branch 'MDL-56785-master-fix' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Nov 2016 06:02:43 +0000 (14:02 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 09:07:40 +0000 (09:07 +0000)

Trivial merge