Merge pull request #1321 from ffontaine/master