Merge "Update for chnaged MapInfo constructor."