Rolling back to sync with master branch.
sdo-venkman was created from a stale old copy somehow. Apologies.
Need to re-apply sports and other changes.