Commit 4631d84c2bb51395efe3156f9c9f1a6b0e277947

Ebrahim Byagowi 2016-10-18T14:30:00

Merge back @vlj's local patches of vcpkg