Added contribution of David Zwicker (print NaN±…).
Merge branch 'master' into master_python2.3