hotfix3_1 with feature2.xml oh noes!