Merge branch 'MDL-54868-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Jun 2016 08:19:48 +0000 (09:19 +0100)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Jun 2016 07:05:26 +0000 (15:05 +0800)

Trivial merge