Merge pull request #2731 from shaavan/issue2711