Merge pull request #3241 from ffontaine/master