1.6.0
Merge branch 'master' into chrome35

Conflicts:
	package.json
2.1.0