Merge branch 'MDL-49612-master' of git://github.com/dpalou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 09:30:12 +0000 (09:30 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 09:30:12 +0000 (09:30 +0000)

Trivial merge