my fixes
Merge branch 'master' into timo
japreview: minor fixes