Merge branch 'master' into marty
Merge branch 'master' into marty
Added cc and alert message back in.  Fixed some stuff with plywood.
Merge branch 'marty'