Merge branch 'master_MDL-50972' of https://github.com/danmarsden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Dec 2015 06:01:17 +0000 (14:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Dec 2015 06:01:17 +0000 (14:01 +0800)

Trivial merge