Master merged with @leon9 strings changes.