Merge branch 'wip-MDL-57019-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Nov 2016 03:54:16 +0000 (11:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Nov 2016 03:54:16 +0000 (11:54 +0800)

Trivial merge