Merge pull request #1317 from ffontaine/master