Merge branch 'MDL-57002-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Nov 2016 00:21:31 +0000 (08:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Nov 2016 00:21:31 +0000 (08:21 +0800)

Trivial merge