Added fix for Bug 20869
Merge branch 'master' of https://github.com/oleg-st/mono