Merge branch 'MDL-54627_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 19 May 2016 09:59:06 +0000 (10:59 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 19 May 2016 09:59:06 +0000 (10:59 +0100)

Trivial merge