Spirit: Merging from trunk