Merge branch 'stable'

Conflicts:
	lib/Slic3r/Geometry/Clipper.pm
	lib/Slic3r/Layer/Region.pm

1 files changed, 1 insertions, 0 deletions

diff --git a/t/multi.t b/t/multi.t
index 0071363d9..855461791 100644
--- a/t/multi.t
+++ b/t/multi.t
@@ -21,6 +21,7 @@ use Slic3r::Test;
     $config->set('extruder_offset', [ [0,0], [20,0], [0,20] ]);
     $config->set('temperature', [200, 180, 170]);
     $config->set('first_layer_temperature', [206, 186, 166]);
+    $config->set('toolchange_gcode', ';toolchange');  # test that it doesn't crash when this is supplied
     
     my $print = Slic3r::Test::init_print('20mm_cube', config => $config);