Merge branch 'master' into windows-port
authorDavid Antler <david.a.antler@intel.com>
Mon, 25 Apr 2016 16:15:27 +0000 (09:15 -0700)
committerDavid Antler <david.a.antler@intel.com>
Mon, 25 Apr 2016 16:15:51 +0000 (09:15 -0700)
commitf9124705e523adc3bcad7c29e7165769c1d02ffc
tree9b2dfd2ff633820240086683fd06a129fb94bd03
parenta01c5d0400bfa9fd51388c1c0bb6e0a5d64d0a2e
parent6f5426d1355749501a76d1c86e35e696306e49c6
Merge branch 'master' into windows-port

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