Merge branch 'MDL-54734-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Jul 2016 07:01:06 +0000 (15:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Jul 2016 07:01:06 +0000 (15:01 +0800)

Trivial merge