Merged trunk changes for 1.2