Merge branch 'MDL-54941-master-fixes' of https://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 3 Aug 2016 06:35:08 +0000 (14:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 3 Aug 2016 06:35:08 +0000 (14:35 +0800)

Trivial merge