Updated documentation version in conf.py.
Merge branch 'v7-stable' into v7-devel
Updated documentation version in conf.py.
Updated documentation version in conf.py.