Merge branch 'master' into library-use-case

diff --cc src/machine/dispatch.rs
Simple merge

diff --cc src/machine/machine_state.rs
Simple merge

diff --cc src/machine/mock_wam.rs
Simple merge

diff --cc src/machine/mod.rs
index 38afac5b403182ac495a31a772058a48d9e070fb,c44df7624fd91e6c4258f7075418e55bcda9fa12..b4f1687e95cc1a10ac6567d8179ba2b2a55939a4
--- 1/src/machine/mod.rs
--- 2/src/machine/mod.rs
+++ b/src/machine/mod.rs
@@@ -5,8 -5,8 +5,9 @@@ pub mod code_walker
  #[macro_use]
  pub mod loader;
  pub mod compile;
 +pub mod config;
  pub mod copier;
+ pub mod cycle_detection;
  pub mod disjuncts;
  pub mod dispatch;
  pub mod gc;

diff --cc src/machine/system_calls.rs
Simple merge