Fixed conductivity units for pseudo-pure

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
Merge remote-tracking branch 'refs/remotes/origin/master' into NoExternalMedia