Merge pull request #2725 from shaavan/issue2096