Merge long Japanese header fix from 3.2.