jb-mr1_build-6
Merge "Updated Japanese translations" into jb-mr1