update the 3.x branch with actual master