am 60b239c2: Treat empty and null strings equally. Fixes a data loss on e.g. rotation

* commit '60b239c24c05233bbf3f7cb45697252e15ec76cc':
  Treat empty and null strings equally. Fixes a data loss on e.g. rotation