Merged changes form main trunk since 2.1RC