restore upstream merge to master