Merge of http://members.cox.net/junkio/git-jc.git