new message removed
Merge branch 'master' into newbranch