merged in upstream patch for rendering with my changes to render uml into another window