am 4769f0b8: Merge "Even cleaner shutdown." into jb-mr1-dev

* commit '4769f0b873030bbaa6977fe18696961d1d1b26ba':
  Even cleaner shutdown.