Merge commit 'aeed585d19f4db006ca765eed37d629831e4b563' * commit 'aeed585d19f4db006ca765eed37d629831e4b563': Revert "Remove STOPSHIP comment."
Merge commit 'aeed585d19f4db006ca765eed37d629831e4b563' * commit 'aeed585d19f4db006ca765eed37d629831e4b563': Revert "Remove STOPSHIP comment."