Merge pull request #1711 from reaperhulk/serialize-format-private-format

s/Format/PrivateFormat