Port to 1-3-stable

Signed-off-by: Jerrold Thompson <jet@whidbey.com>