Fixed issue with wrong animation between lines of different length. Related to #1325 and #1386.
Merge remote-tracking branch 'origin/master'