fix issue with nil latlan values failing to map
Merge branch 'hotfix-0.6.7'