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

* commit '833384ba110a2310f5462df7a42749fc1ce78820':
  Spooler broken on upgrade.