Merge branch 'MDL-55357_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Aug 2016 09:54:28 +0000 (10:54 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Aug 2016 09:54:28 +0000 (10:54 +0100)

Trivial merge