Merge branch 'MDL-54617-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jun 2016 15:41:46 +0000 (16:41 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:10 +0000 (09:04 +0100)

Trivial merge