Merge branch 'for-3.0' into for-3.1

Trival fixup for move of I/O code into separate file.