Merge branch 'MDL-35104-master-2' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 03:18:03 +0000 (11:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 03:18:03 +0000 (11:18 +0800)

Trivial merge