Wrecked Ship G-Mode: Second Pass#2111

osse101 merged 6 commits intovg-json-data:mastervg-json-data/sm-json-data:masterfrom

kjbranch:g-wskjbranch/sm-json-data:g-wsCopy head branch name to clipboard