Fix message display
Merge branch 'master' into directives