Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1

diff --cc Marlin/Configuration.h
Simple merge

diff --cc Marlin/planner.cpp
Simple merge

diff --cc Marlin/stepper.cpp
index bcad026fbef3c9c645a707b946c9f614415f713a,e0b76788510379d036608698f7881758cc8cc94c..e25d179df803ba28aa75792d9be76ad61a7fabc5
--- 1/Marlin/stepper.cpp
--- 2/Marlin/stepper.cpp
+++ b/Marlin/stepper.cpp
@@@ -471,14 -462,9 +472,14 @@@ ISR(TIMER1_COMPA_vect
          for(int8_t i=0; i < step_loops; i++) {
            advance += advance_rate;
          }
 +        //if(advance > current_block->advance) advance = current_block->advance;
 +        // Do E steps + advance steps
 +        e_steps += ((advance >>8) - old_advance);
 +        old_advance = advance >>8;  
 +        
        #endif
      } 
-     else if (step_events_completed > current_block->decelerate_after) {   
+     else if (step_events_completed > (unsigned long int)current_block->decelerate_after) {   
        MultiU24X24toH16(step_rate, deceleration_time, current_block->acceleration_rate);
        
        if(step_rate > acc_step_rate) { // Check step_rate stays positive