apply: backport applyNext behaviour fixes
0.4.24
Merge branch '0.4' into 0.5

Conflicts:
	lib/xjst/ometa/xjst.ometajs
	package.json