updated to 2.11-20130426-nonprod