Merge pull request #3233 from psidhu/master