Merge it to master; if we decide to make another release for SI 3.0, we can create a 3.0 branch at that time from the previous commit). No need to make one now.