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

Trivial merge