# HG changeset patch
# User Chris Cannam
# Date 1476958827 -3600
# Node ID fc00a06feecd038ab4de63853621a82589b6243f
# Parent  0d04b1cdb9f9c98403af5bdd87352379de52a7d9# Parent  52675a1f662c62f94596146e4ed5b237fe562f09
Merge from branch "msvc2015_64"