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