Merge the latest changes to master in the vs2015 branch.

Merge the following commits:
- https://github.com/google/syzygy/commit/f10f8a119b48137b6f10fc1e85abd257cc32c1ab
- https://github.com/google/syzygy/commit/ba2ce2c31c16fe53b337121ec480fc5d4dfb4eec

R=chrisha@chromium.org

Review URL: https://codereview.chromium.org/2321423002 .
13 files changed