Merge branch 'MDL-56463_master-fix2' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 18 Nov 2016 03:02:19 +0000 (11:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 18 Nov 2016 03:02:19 +0000 (11:02 +0800)

Trivial merge