Merge branch 'MDL-50258_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Dec 2015 09:04:35 +0000 (09:04 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Dec 2015 09:04:35 +0000 (09:04 +0000)

Trivial merge