fixed test for sh
Merge remote-tracking branch 'origin/1.4' into devel