Add ship drop
Fix translate
Up version to r515
Merge remote-tracking branch 'origin/master' into gh-pages