Merge remote-tracking branch 'origin/dev' into dev

kity @ d4e00b31

-Subproject commit ef84b3d3597aad569379f1f76715ca5bd2c951d3
+Subproject commit d4e00b314db4116a92583114bcb67ff9a3c4d48d

src/module/layout.default.js

@@ -217,7 +217,7 @@ KityMinder.registerModule( "LayoutDefault", function () {
 				}
 				for ( var i = 0; i < children.length; i++ ) {
 					var childLayout = children[ i ].getLayout();
-					if ( children[ i ].getRenderContainer().getHeight() !== 0 )
+					if ( children[ i ].getRenderContainer().getPaper() && children[ i ].getRenderContainer().getHeight() !== 0 )
 						sum += childLayout.branchheight;
 				}
 				return sum;