Add severity to plugin messages.
Merge branch 'master' into feature/73