Merge pull request #3310 from bentley/master