Merge branch 'MDL-54865-master' of git://github.com/ryanwyllie/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Jun 2016 08:36:52 +0000 (09:36 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Jun 2016 08:24:55 +0000 (09:24 +0100)

Trivial merge