Merge branch 'redmine-ios'