Turn on rtsopts (and -N by default)
Merge branch 'postgres' into postgres-fay