Merge branch 'MDL-52304_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Dec 2015 08:20:10 +0000 (08:20 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Dec 2015 08:20:10 +0000 (08:20 +0000)

Trivial merge