My configurations
Merge branch 'Marlin_v1' into 12_20_2014