0.8.4
Merge branch 'master' into unstable
Rework removing/drag&drop code