Merge pull request #3261 from ffontaine/master