am 23e2bba4: Merge "Spooler broken on upgrade." into klp-dev

* commit '23e2bba4e17662e941c2c6672f66249aff4a0470':
  Spooler broken on upgrade.