Merge branch 'MDL-42977-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Nov 2016 00:52:42 +0000 (08:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Nov 2016 00:52:42 +0000 (08:52 +0800)

Trivial merge