Merge pull request #1200 from dorkster/fixes

Suppress warning about "orientation" key in map header