Merge branch 'MDL-56346-master' of https://github.com/lucisgit/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Dec 2016 06:34:06 +0000 (14:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Dec 2016 06:34:06 +0000 (14:34 +0800)

Trivial merge