Update from 20000422 to 20000615. This PR supersedes ports/19140, please close old PR.
State Changed From-To: open->closed Committed with my own additions/cleanups. Thanks!