Merge branch 'master' into R4_HEAD

Conflicts:
	bundles/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html
tree: 8d8a6107c18967b86828dc65fbd4fee310d3c47c
  1. bundles/
  2. .gitignore