* This is a merge up to commit bd319269aa of the localization branch * Also fixes Clang warnings
bd319269aa