Merge branch 'master' into windows-port
authorDavid Antler <david.a.antler@intel.com>
Tue, 26 Apr 2016 22:53:25 +0000 (15:53 -0700)
committerDavid Antler <david.a.antler@intel.com>
Tue, 26 Apr 2016 22:53:25 +0000 (15:53 -0700)
commitb866038372b9c2a014df7a69cfffd6a6071f75b5
treeff02d4bb6845c9ff29afb54a508360e99bc4b073
parentf9124705e523adc3bcad7c29e7165769c1d02ffc
parent3ffe72650b7820e697bce01bbf75041d271b3fb0
Merge branch 'master' into windows-port

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