Merge pull request #2090 from m32/master