Catch-up merge from master sources @186352 to branch/2014-04-15/mvffnoseg.