Port Map 1.3.1-r46
Merge pull request #1442 from leoj3n/port-map-1.3.1-r46

Port Map 1.3.1-r46