Pull request from @PEMapModder

Read the diff yourself and find me on IRC or forums if you have any questions. Don't ask here.