updated to 2.11-20130421-nonprod