Merge branch 'MDL-52487_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Dec 2015 09:23:03 +0000 (09:23 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Dec 2015 09:23:03 +0000 (09:23 +0000)

Trivial merge