NAMapKit 3.1.
Merge pull request #11255 from dblock/NAMapKit

NAMapKit 3.1.