Merge branch 'trunk' into patch-2