Merge branch 'MDL-55209' of https://github.com/NeillM/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Nov 2016 00:24:39 +0000 (08:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Nov 2016 00:24:39 +0000 (08:24 +0800)

Trivial merge