This commit: re-submitted version, including comments and replies.