Fixed #345, Fixed #267.
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1