Merged trunk
Merged trunk