Merge pull request #1042 from avallee/master