Maps: Implemented mapline and mappoint series types.
Merge remote-tracking branch 'origin/master'