Upgrade to CDI API 1.1-20130305