updating master to 3.x