Merge remote-tracking branch 'origin/next' into es6-promise

Conflicts:
	mithril.js

tests/mithril-tests.js

@@ -592,7 +592,6 @@ function testMithril(mock) {
 		var firstBefore = root.childNodes[0]
 		m.render(root, [m("a", {key: 2}), m("br"), m("a", {key: 1})])
 		var firstAfter = root.childNodes[2]
-		console.log(root.childNodes)
 		return firstBefore == firstAfter && root.childNodes[0].key == 2 && root.childNodes.length == 3
 	})
 	test(function() {
@@ -1455,6 +1454,7 @@ function testMithril(mock) {
 			}
 		})
 		root.childNodes[0].onclick({})
+		mock.requestAnimationFrame.$resolve() //teardown
 		return strategy == "diff" && root.childNodes[0].childNodes[0].nodeValue == "1"
 	})
 	test(function() {