Merge branch 'MDL-56677_master-fix' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Nov 2016 06:56:32 +0000 (14:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Nov 2016 06:56:32 +0000 (14:56 +0800)

Trivial merge