Log messages reworded.
Merge branch 'master' into staging