Merge and update code against the latest master.