merge in jb-release history after reset to master