Merge "Add a lacking message format letter 's'"