Merge branch 'master' into feature/newBoxModel

Conflicts:
	org.eclipse.vex.core.tests/META-INF/MANIFEST.MF
	org.eclipse.vex.releng/Vex.launch

Change-Id: Iacb2f72ef27b0e7832197a44552b3501bd2957fe