Merge pull request #402 from patricksnape/landmarks_fixes

Landmarks fixes
Merge remote-tracking branch 'upstream/master' into landmarks_fixes