updated to 2.11-20130506-nonprod