Merge branch 'master' into windows-port
authorDavid Antler <david.a.antler@intel.com>
Wed, 27 Apr 2016 21:30:57 +0000 (14:30 -0700)
committerDavid Antler <david.a.antler@intel.com>
Wed, 27 Apr 2016 21:30:57 +0000 (14:30 -0700)
commitb9f543a2d95dc0db88c2aa82a8ac880c2ab6296d
tree02e91ec9d0f22ac4592791aa724a2335d106a901
parentb866038372b9c2a014df7a69cfffd6a6071f75b5
parenta7316ee86df0fef32b6a3e69ebfd7512a7ed9d92
Merge branch 'master' into windows-port

Change-Id: Ia553668db05e19ade5afa2b42b7e42632cae4cba
Signed-off-by: David Antler <david.a.antler@intel.com>