Merge branch 'master' into Dustin
plywood data clearing and other fixes
Merge branch 'Dustin'