[GIT PULL] fix for bug 754254