Merge commit 'a0e846d5e9abe7b6692503b38ee149637a0bc9ef' into packaged

Conflicts:
	.gitignore
removed extra bootstrap
Merge remote-tracking branch 'upstream/packaged' into packaged

Conflicts:
	.gitignore