Pull closest in to master

then trash master.
Closest was integrated in to ORPHAN cleanly and also exists in dev.