[#1013] Provide messages.default not messages
Merge pull request #1893 from baloo/improvements/1013-messages-override

[#1013] Provide messages.default not messages