Merge branch 'origin/master'
updated message.pot