Fixed #394
Merge branch 'Marlin_v1' into Reprappro_Mendel