Fixes #3447: Upgrade docs for 2.6