Merge tag '4.7.0' into HEAD

Conflicts:
	mode/meta.js
Merge commit '22addbf'