Merge commit '517ebaa69a9c4baed99bb5667b956dab129c96e7' * commit '517ebaa69a9c4baed99bb5667b956dab129c96e7': remove an old STOPSHIP comment
Merge commit '517ebaa69a9c4baed99bb5667b956dab129c96e7' * commit '517ebaa69a9c4baed99bb5667b956dab129c96e7': remove an old STOPSHIP comment