Merge branch 'MDL-52553_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Dec 2015 10:51:01 +0000 (10:51 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Dec 2015 10:51:01 +0000 (10:51 +0000)

Trivial merge