Merge remote-tracking branch 'upstream/master'

Conflicts:
	org.agileware.natural.cucumber/.classpath