Merge tag 'v1.99.47' into bh/nerdtree