Merge pull request #1570 from mono/fix27010