redmine issues
merge with master