Keep up with the main dev fork

Bring my copy up to date with ErikZalm's Marlin_v1 branch.