Merge pull request #3648 from hauke/io