merge in pi-release history after reset to master