Right
Merge remote-tracking branch 'upstream/master' into Wouter

Conflicts:
	.project
	.pydevproject