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