update redmine download URL
merger conflict
fix conflict