Pull updates from master upstream.

Signed-off-by: Regis Merlino <regis.merlino@intel.com>