Merge branch 'MDL-52958_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 10:57:38 +0000 (10:57 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 10:57:38 +0000 (10:57 +0000)

Trivial merge