This wasn't part of the automated commit (!252 (merged)) because it was too old, but this should also be kept up to date.
