Accommodate changes from tag Merge20130221
Fix relative paths