Merge branch 'MDL-56823' of git://github.com/aolley/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Nov 2016 02:04:21 +0000 (10:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Nov 2016 02:04:21 +0000 (10:04 +0800)

Trivial merge