Merge pull request #2996 from shaavan/issue2882.2