Merge branch 'R3_6_maintenance' into R3_6_maintenance_Java7
tree: 746de73540ab4a1d10a87a49866aea6883ad9a6d
  1. bundles/
  2. features/