Merge pull request #1585 from diegosarmentero/master

huge improve in performance when working with splits
support undock editor
Merge remote-tracking branch 'upstream/master'