merge in master-release history after reset to master