# HG changeset patch
# User Chris Cannam
# Date 1535724867 -3600
# Node ID d3bd593a610cc78a64e02d7115f085c0f65e1c87
# Parent  4d7542238772bc45966350ead1774827540b1e18# Parent  34cb861994a243adbc6a4cbd626ef58a89aafff2
Merge from branch c++14