Bugfix for incomplete search being stopped on switch to another folder
Merge remote-tracking branch 'origin/master'