Merge branch 'wip-MDL-57186-master' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Nov 2016 02:20:31 +0000 (10:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Nov 2016 02:20:31 +0000 (10:20 +0800)

Trivial merge