Merged with upstream master.  It is guaranteed that some things will be broken (especially look at the "findMapWithLOC" function, and with Map/LOC registration