updated to 2.11-20130518-nonprod