Catch-up merge from master/...@185556 to branch/2014-03-30/addrset.