diff --git a/Algebraic_kernel_d/include/CGAL/RS/basic.h b/Algebraic_kernel_d/include/CGAL/RS/basic.h
index a5b43a50896..81938e4a329 100644
--- a/Algebraic_kernel_d/include/CGAL/RS/basic.h
+++ b/Algebraic_kernel_d/include/CGAL/RS/basic.h
@@ -40,7 +40,7 @@
 #define CGAL_RS_MIN_PREC        0
 #endif
 
-#if ( defined CGAL_HAS_THREADS and !defined CGAL_RS_NO_TLS )
+#if ( defined CGAL_HAS_THREADS && !defined CGAL_RS_NO_TLS )
 #  ifdef _MSC_VER
 #    ifdef _WINDLL
 #      error "Can't build CGAL_RS as thread safe."
diff --git a/Algebraic_kernel_d/include/CGAL/RS/dyadic.h b/Algebraic_kernel_d/include/CGAL/RS/dyadic.h
index 41837e91d06..e0b9b368ba0 100644
--- a/Algebraic_kernel_d/include/CGAL/RS/dyadic.h
+++ b/Algebraic_kernel_d/include/CGAL/RS/dyadic.h
@@ -27,7 +27,6 @@
 
 // for c++, compile with -lgmpxx
 #ifdef __cplusplus
-#include <gmpxx.h>
 #include <iostream>
 #endif
 
@@ -58,7 +57,7 @@ inline void dyadic_set(dyadic_ptr rop,dyadic_srcptr op){
                 dyadic_set_prec(rop,mpfr_get_prec(op));
                 mpfr_set(rop,op,GMP_RNDN);
         }
-        CGAL_assertion(mpfr_equal_p(rop,op));
+        CGAL_assertion(mpfr_equal_p(rop,op)!=0);
 }
 
 inline void dyadic_set_z(dyadic_ptr rop,mpz_srcptr z){
@@ -85,7 +84,7 @@ inline void dyadic_set_fr(dyadic_ptr rop,mpfr_srcptr op){
         if(rop!=op){
                 dyadic_set_prec(rop,mpfr_get_prec(op));
                 mpfr_set(rop,op,GMP_RNDN);
-                CGAL_assertion(mpfr_equal_p(rop,op));
+                CGAL_assertion(mpfr_equal_p(rop,op)!=0);
         }
 }
 
@@ -106,7 +105,7 @@ inline void dyadic_get_exactfr(mpfr_ptr rop,dyadic_srcptr op){
         if(rop!=op){
                 dyadic_set_prec(rop,mpfr_get_prec(op));
                 mpfr_set(rop,op,GMP_RNDN);
-                CGAL_assertion(mpfr_equal_p(rop,op));
+                CGAL_assertion(mpfr_equal_p(rop,op)!=0);
         }
 }
 
@@ -301,7 +300,7 @@ inline void dyadic_pow_ui(dyadic_ptr rop,dyadic_srcptr op1,unsigned long u){
                 return;
         }
         if(mpfr_zero_p(op1)){
-                CGAL_assertion_msg(u,"0^0");
+                CGAL_assertion_msg(u!=0,"0^0");
                 dyadic_set_ui(rop,0);
                 return;
         }
diff --git a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_member.h b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_member.h
index 41d68feb702..3f6a3320431 100644
--- a/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_member.h
+++ b/Algebraic_kernel_d/include/CGAL/RS/polynomial_1_member.h
@@ -130,7 +130,7 @@ int RS_polynomial_1::get_degree_static()const{
 
 inline
 bool RS_polynomial_1::has_sfpart()const{
-        return (_is_sf?true:(bool)_sfpart.get());
+        return (_is_sf?true:(bool)(_sfpart.get()));
 }
 
 inline
@@ -160,7 +160,7 @@ void RS_polynomial_1::set_sf()const{
 
 inline
 bool RS_polynomial_1::has_sqfr()const{
-        return _sqfr.get();
+        return (bool)(_sqfr.get());
 }
 
 inline
diff --git a/Boolean_set_operations_2/dont_submit b/Boolean_set_operations_2/dont_submit
index ca72b6b7bd7..ba2b5c489a6 100644
--- a/Boolean_set_operations_2/dont_submit
+++ b/Boolean_set_operations_2/dont_submit
@@ -1,3 +1,3 @@
 bench
 demo/Boolean_set_operations_2/data/vlsi_2.dxf
-
+demo/Boolean_set_operations_2_GraphicsView
diff --git a/Installation/CHANGES b/Installation/CHANGES
index 47780c24f5f..e0932edbae7 100644
--- a/Installation/CHANGES
+++ b/Installation/CHANGES
@@ -102,6 +102,12 @@ CGAL 3.6 offers the following improvements and new functionality :
   - The package can now be used together with the 3D Periodic Triangulation 
     package to compute periodic alpha shapes. 
 
+6.5 2D/3D Triangulations, 2D Segment Delaunay Graph, 2D Apollonius Graph
+
+  - The constructor and insert function taking ranges now produce
+    structures whose iterator orders is now deterministic (same at each
+    run).
+
 
 7 Mesh Generation
 
diff --git a/PDB/dont_submit b/PDB/dont_submit
index 1052f225904..843f3469e0f 100644
--- a/PDB/dont_submit
+++ b/PDB/dont_submit
@@ -1,2 +1,4 @@
 test/PDB/check_refine_alignment.cpp
 doc_doxygen
+demo
+examples