updated to 2.11-20130422-nonprod