Merging from SourceFabric - BookType 1.6