Bring the Location Labs fork up to date

One of our many possible options.