Fixed the z1pt0<->z2pt5 inversion problem
Merge pull request #1195 from gem/z1pt0_vs_z2pt5

Fixed the z1pt0<->z2pt5 inversion problem