Merge remote-tracking branch 'origin/i22962'
fix redmine bug
Merge branch 'master' into development