Merge master into worker-lint