Open next-stable branch.
Trackster: fixes for creating and resizing composite line tracks.
Automated merge of next-stable to default