Applying patches backported from 3.1, by Gregor Lingl.
2 files changed