Re #8497. Added in a missing factor of 2pi.
Re #8497. Missed a unit test that needed to be changed.
Merge remote-tracking branch 'origin/feature/8497_two_pi'