Location updates are less of a problem now. Bambow.
Merge branch 'markers-x'