merge Redmine ios to master