-> 0.9
version update
Merge branch 'master' into 0.9

Conflicts:
	package.json