Merge branch 'MDL-56820-master' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 Nov 2016 04:20:17 +0000 (12:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 Nov 2016 04:20:17 +0000 (12:20 +0800)

Trivial merge