Merge branch 'wip-MDL-23919-master' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 6 Apr 2017 01:02:36 +0000 (09:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 6 Apr 2017 01:02:36 +0000 (09:02 +0800)

Trivial merge