Reviewed-by: xuelei Contributed-by: NPasi Eronen <pe@iki.fi>
Summary: Also reviewed by Andrew Gross<Andrew.Gross@Oracle.COM> Reviewed-by: vinnie
