Merge branch 'MDL-52216_master' of https://github.com/eugeneventer/moodle-fixes
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 Nov 2016 03:21:26 +0000 (11:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 Nov 2016 03:21:26 +0000 (11:21 +0800)

Trivial merge