Merge remote-tracking branch 'origin/master' into codeeditor

Conflicts:
	bundles/code/org.eclipse.fx.code.editor.configuration.text/.settings/ca.ecliptical.pde.ds.prefs