Re #8067. Corrected error in removing time-zone from patch version.
Merge remote branch 'origin/bugfix/8067_patch_version'