Merge branch 'MDL-54008_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 May 2016 08:52:16 +0000 (09:52 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 2 May 2016 08:52:16 +0000 (09:52 +0100)

Trivial merge