0.2.27
Merge branch 'master' into new-api

Conflicts:
	package.json