Merge branch 'MDL-50937-fixes' of git://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 20 Jul 2016 03:20:08 +0000 (11:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 20 Jul 2016 03:20:08 +0000 (11:20 +0800)

Trivial merge