Version update.
Merge remote-tracking branch 'remotes/origin/integration'

Conflicts:
	support/client/lib/version.js