Merge pull request #3325 from ffontaine/master