Catch-up merge from master sources @186436 to branch/2014-04-08/align.