otroan/MAP — pull request #3 by wdec (2012-10-19 16:59:15+00:00)
Title: Merge 1:1 changes + fixes

For publishing on monday