Merge branch 'MDL-55215-master-fix2' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Nov 2016 07:01:46 +0000 (15:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Nov 2016 07:01:46 +0000 (15:01 +0800)

Trivial merge