release 2.5.0
Merge branch 'master' into dependency-less

Conflicts:
	package.json