420.13 Issue76 branch - Folded in very short line handling from G2 Rob branch - other trapezoid changes not in yet.