Merge branch 'MDL-54921-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Dec 2016 07:13:47 +0000 (15:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Dec 2016 07:13:47 +0000 (15:13 +0800)

Trivial merge