Catch-up merge from master sources to mps/branch/2013-05-17/emergency.