Merge branch 'upstream'

Conflicts:
	curl-dev.js
	flashblock-dev.js