Merge "removed invalid characters from properties file"