currency fix
Merge branch 'master' into jp
fx fix
Merge branch 'master' into jp