Stepped back to Jed's version before merge - somehow merging embedded github's differencing comments into file.