Merging i8n branch to master, mostly header changes