1.7.5

merged from visad