Pull master into fixing_more_choices