update Amber to latest master