Fix for Bug 2411
Merge branch 'master' into avaneesh