Merge "Sync up nameser with upstream(2014.03.05)"