Applied all the trunk changes (up to this point) to the 4.3.x sources