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