Merge branch 'master' into set-state-cb

src/diff/index.js

@@ -524,7 +524,7 @@ export function unmount(vnode, parentVNode, skipRemove) {
 	if ((r = vnode._children)) {
 		for (let i = 0; i < r.length; i++) {
 			if (r[i]) {
-				unmount(r[i], parentVNode, typeof vnode.type != 'function');
+				unmount(r[i], parentVNode, skipRemove || typeof vnode.type !== 'function');
 			}
 		}
 	}