fix problem with maps.
fix problem with maps.
fixed problem with maps.
fixed problem with maps.
fixed problem with maps.
Updates from the mothership.

Merge branch 'master' into tfp14