index on master: e9261b6 Fixed more dragging things
WIP on master: e9261b6 Fixed more dragging things
Merge commit 'stash'