Branch is for 1.10 snapshot (new 1.x release with all bugfixes
cherrypicked from 2.0 and with CDI removed!)