Be more friendly when doing --cat of a snapshot.
Merge branch 'stable'