Strip png options
More useful error messaging around invalid formats
info.format may have been specified
Merge branch 'master' into csv-debugging