Merge master.

Move a selected line/s up and down