Use desktop-restore-frames if available in place of frame-restore
Merge branch 'purcell'

* purcell:
  Use desktop-restore-frames if available in place of frame-restore