Merge changes from https://github.com/mfloryan/metrics-net/tree/hcfix to local.

Automated merge from pull messed up the proj file.