> Merged into master

This also needed to be backported to v9_11, v9_10 and v9_9; I've
taken care of it.