Merge branch 'MDL-57127-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Nov 2016 06:27:23 +0000 (14:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Nov 2016 06:27:23 +0000 (14:27 +0800)

Trivial merge