Many more strings changed
Merge branch '1.0.0'