Merge branch 'MDL-54165-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Jul 2016 04:01:51 +0000 (12:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Jul 2016 04:01:51 +0000 (12:01 +0800)

Trivial merge