Merge branch 'MDL-56877' of https://github.com/eSrem/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Nov 2016 03:08:01 +0000 (11:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Nov 2016 03:08:01 +0000 (11:08 +0800)

Trivial merge