Fix versionadded:: 2.x merges.
1 file changed