fix #589, toolbar "info" doesn't work in cwd
Merge branch '2.x' into 2.1
Merge branch '2.1' into 2.1_n