update version info
resolve unit test issue with other region locales than en
merge master