Merge pull request #1764 from jean/2.0.x

Don't list maps we aren't allowed to see