Task #0051: Manual update after c++11 fix.