Spirit: Merging from trunk
Merge changes from trunk
Merge from Trunk