Updated for release
Merge branch 'release2.9' into develop

Conflicts:
	src/meta.js
Update for release 2.9