Pull almccon's changes into citytracking