Merge branch 'MDL-53791-master' of git://github.com/crazyserver/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 27 Apr 2016 07:51:43 +0000 (08:51 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 27 Apr 2016 07:51:43 +0000 (08:51 +0100)

Trivial merge