Merge branch 'MDL-29110-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Oct 2016 01:48:25 +0000 (09:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Oct 2016 01:48:25 +0000 (09:48 +0800)

Trivial merge