Word-wrapping for jby revision
Merged jby revisions into original