Resolve conflicts from merge of master into urlstate