Changes to reflect recent change in stable branch commit policy (hopefully