Merge branch 'Dustin'
Merge branch 'master' into Dustin
waste reset to 0 and tear off layers reset to 0
Merge branch 'master' into Dustin