Reviewed-by: rriggs, psandoz, chegar
Contributed-by: dl@cs.oswego.edu, alan.bateman@oracle.com