Merge branch 'unstable' of https://git01.codeplex.com/z3 into fpa-api

src/duality/duality_rpfp.cpp

@@ -3117,7 +3117,7 @@ done:
       }
 
       if(node->Annotation.IsEmpty() || eq(node->Annotation.Formula,prev_annot) || (repeated_case_count > 0 && !axioms_added) || (repeated_case_count >= 10)){
-      looks_bad:
+          //looks_bad:
 	if(!axioms_added){
 	  // add the axioms in the off chance they are useful
 	  const std::vector<expr> &theory = ls->get_axioms();

src/smt/old_interval.cpp

@@ -295,6 +295,8 @@ interval & interval::operator*=(interval const & other) {
     }
     if (other.is_zero()) {
         *this = other;
+        m_lower_dep = m_manager.mk_join(m_lower_dep, m_upper_dep);
+        m_upper_dep = m_lower_dep;
         return *this;
     }