Merge branch 'edge' of git://github.com/arthurwolf/Smoothie into feature/post_play_gcode