Merge upstream and master

Conflicts:
	.gitignore
	toolset/benchmark/benchmarker.py
	toolset/benchmark/framework_test.py
	toolset/run-tests.py
	toolset/setup/linux/installer.py