Merge remote-tracking branch 'origin/master' into feature_slice_to_png

# Conflicts:
#	xs/CMakeLists.txt

lib/Slic3r/GUI/MainFrame.pm

@@ -116,6 +116,7 @@ sub new {
         wxTheApp->{app_config}->save;
         $self->{plater}->{print} = undef if($self->{plater});
         Slic3r::GUI::_3DScene::remove_all_canvases();
+        Slic3r::GUI::deregister_on_request_update_callback();
         # propagate event
         $event->Skip;
     });