Merge branch 'MDL-51978-master' of https://github.com/jtc/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Jun 2016 00:49:41 +0000 (08:49 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:04 +0000 (09:04 +0100)

Trivial merge