Merge branch 'master' into chrome35

Conflicts:
	apm/package.json
	package.json