fix for bug 2508
Merge branch 'master' into sachin