first try at drag/touch selection
prepare for merge: expand tabs, width=4
Merge remote-tracking branch 'upstream/master'