follesoe/MapReplace — pull request #3 by mikaelbr (2013-11-04 09:41:48+00:00)
Title: Removes unused code and refactors some code

Some cherry-picking messup that duplicated the commit, but no worries for the change set.