ship bug fix - no ss bob waters :'(
Merge origin/master