1.4.6 jp

Merging 1.4.6-jp-3 to master