Merge remote-tracking branch 'upstream/next' into next

Conflicts:
	mithril.js