am 8fff150b: Merge "Fix a STOPSHIP" into lmp-dev

* commit '8fff150bb5c9971c5ba25cf9568a2944ff951c04':
  Fix a STOPSHIP