Merge branch 'MDL-53239_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 06:12:10 +0000 (14:12 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 06:12:10 +0000 (14:12 +0800)

Trivial merge