Catch-up merge from master sources to branch/2014-01-15/nailboard.