Moving "edit tree" button next to "add new" (fixes #8119)
MINOR: Grammar error
Merge pull request #274 from unclecheese/patch-2

MINOR: Grammar error
Merge remote-tracking branch 'origin/3.0' into 3.1