Merge branch 'master' into Dustin
Warranty/tear off auto selection
Merge branch 'Dustin'