Implement per-site command disabling.
Merge branch 'location-disable' into mine-2