Merge pull request #471 from cnlohr/make-linker-make-map

Merge pull request #471 from cnlohr/make-linker-make-map #968