Merge branch 'master' into Dustin
Warranty/tear off required bugs
Merge branch 'Dustin'