PR: 13708, 14000 Submitted by: Ollivier Robert <roberto@keltia.freenix.fr>, Mike Fisher <mfisher@parsons.rh.rit.edu>