Restore tooltips on those map controls that are a bit more difficult to
decipher
Merge pull request #5 from marlin2/pulls

Restore tooltips on those map controls that are a bit more difficult to
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x