Merge pull request #196 from authenticate/upstream

Peer review updates for precompiled header changes.