Merge branch 'MDL-52503_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Jan 2016 14:47:45 +0000 (14:47 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Jan 2016 14:47:45 +0000 (14:47 +0000)

Trivial merge