Merge branch 'MDL-52333_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 10 Dec 2015 11:03:50 +0000 (11:03 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Dec 2015 11:03:50 +0000 (11:03 +0000)

Trivial merge