12052014 translation
Merge remote-tracking branch 'origin/12052014_watabe_translation' into dev