Merge the latest version form JST-CN:master