Merge branch 'master_MDL-56808' of git://github.com/danmarsden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Jan 2017 04:10:48 +0000 (12:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Jan 2017 04:10:48 +0000 (12:10 +0800)

Trivial merge