Merge remote-tracking branch 'upstream/master' into 2.1

Conflicts:
	docs/api_methods_1_x.asciidoc
	docs/browser_builds.asciidoc