Stamped out a few references to goto-10.
Merge branch 'goto10'