Merge branch '1.0.x'

Conflicts:
	src/smt/smt_engine.cpp

diff --cc src/smt/smt_engine.cpp
index e7c0999da0d49f570f4ceff50a06b1bcf891c1b9,af02c518676c884b8b329e9a2a56324fa419e863..8eb6664ca94d5553ca6d40a6707307e7a337b6b8
--- 1/src/smt/smt_engine.cpp
--- 2/src/smt/smt_engine.cpp
+++ b/src/smt/smt_engine.cpp
@@@ -388,10 -366,7 +388,11 @@@ public
    }
  
    ~SmtEnginePrivate() {
 +    if(d_propagatorNeedsFinish) {
 +      d_propagator.finish();
 +      d_propagatorNeedsFinish = false;
 +    }
+     d_smt.d_nodeManager->unsubscribeEvents(this);
    }
  
    void nmNotifyNewSort(TypeNode tn) {