Skip to content
True merge from 6.0 trunk. Also fixed one patch description.