commit of upstream master

Signed-off-by: g-pan <greg.panagiotatos@lexisnexis.com>