Changed the wording of log msgs.!
Merge branch 'master' into staging