Merge branch 'master' into startup

diff --combined vm/vm.hpp
index 4aef9a4f7210cdc8f0bd636f040c70182387cdc4,202996ce2624a1dad3c6b80773e0e2da6390d7b5..c1c6014eea9aaab7b5ebfc7e03e88b587fa08a8d
--- 1/vm/vm.hpp
--- 2/vm/vm.hpp
+++ b/vm/vm.hpp
@@@ -253,8 -253,6 +253,6 @@@ struct factor_v
        void collect_nursery();
        void collect_aging();
        void collect_to_tenured();
-       void big_code_heap_update();
-       void small_code_heap_update();
        void collect_full_impl(bool trace_contexts_p);
        void collect_growing_heap(cell requested_bytes, bool trace_contexts_p, bool compact_code_heap_p);
        void collect_full(bool trace_contexts_p, bool compact_code_heap_p);
@@@ -668,7 -666,6 +666,7 @@@
        void init_factor(vm_parameters *p);
        void pass_args_to_factor(int argc, vm_char **argv);
        void start_factor(vm_parameters *p);
 +      void stop_factor();
        void start_embedded_factor(vm_parameters *p);
        void start_standalone_factor(int argc, vm_char **argv);
        char *factor_eval_string(char *string);