Merge remote-tracking branch 'origin/master'

Conflicts:
	org.eclipse.vex.feature/feature.xml
diff --git a/org.eclipse.vex.feature/feature.xml b/org.eclipse.vex.feature/feature.xml
index 25bce20..c9e02e8 100644
--- a/org.eclipse.vex.feature/feature.xml
+++ b/org.eclipse.vex.feature/feature.xml
@@ -94,4 +94,11 @@
          version="0.0.0"

          unpack="false"/>

 

+   <plugin

+         id="org.apache.batik.util"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

 </feature>