patches for 2.6.0 Redmine