Fixes the conflicts in the MiniStation map.
Merge pull request #3009 from Giacom/mini_branch

Fixes the conflicts in the MiniStation map.