Merge branch 'MDL-54891-master' of git://github.com/ryanwyllie/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jul 2016 09:38:56 +0000 (10:38 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jul 2016 09:38:56 +0000 (10:38 +0100)

Trivial merge