PR: 8522 Submitted by: maintainer
PR: 4878 Submitted by: Scot W. Hetzel <hetzels@westbend.net>, w/input from phk.