# HG changeset patch
# User Chris Cannam
# Date 1476958801 -3600
# Node ID 8d873a022873d0f0bae885471c23d654cf070d1c
# Parent  1682dd81d0ef222d05861236e1fd47a5b4683890# Parent  3ab6a5f7aca8330e0c16d74266facb615614f67d
Merge from branch "msvc2015_64"