1.2.x

Merge in the internationalization