Merge from mainline (frodo RC2)