Merge pull request #2826 from Jamini/master

MASTER - Mapfixes.
Mapfixes - Hopefully

Signed-off-by: Jamini <mobiousjami@gmail.com>