Merge commit '93a3d833ff57ef8304cb547dd1e3664b6b276ec4' into master-merge

diff --cc radiant/csg.cpp
index be01396d0fa3b75898f09effce1f61f8866b8575,6ca051973c49ebdd731afefcdeb07842428cd5f3..5d20bf1c742b9753953e804201eee50a27109bc6
--- 1/radiant/csg.cpp
--- 2/radiant/csg.cpp
+++ b/radiant/csg.cpp
@@@ -141,9 -164,9 +164,9 @@@ void operator()( Face& face ) const 
                                face.planeChanged();
  
                                if( caulk ){
-                                       Brush_forEachFace( *out.back(), CaulkFace( ExclusionAxis, mindot, maxdot ) );
+                                       Brush_forEachFace( *out.back(), CaulkFace( ExclusionAxis, mindot, maxdot, exclude_vec ) );
                                }
 -                              Face* newFace = out.back()->addFace( face );
 +                              std::shared_ptr<Face> newFace = out.back()->addFace( face );
                                if ( newFace != 0 ) {
                                        newFace->flipWinding();
                                }

diff --cc radiant/gtkdlgs.cpp
Simple merge

diff --cc radiant/mainframe.cpp
Simple merge