# HG changeset patch
# User Chris Cannam
# Date 1474636990 -3600
# Node ID c2c5aa00f1653268a966fd8ecd3dab9c2ae61a67
# Parent  6a74839fc7f041bc407b65c7c135e42507ccda67# Parent  16307ce446e2fce71f877529a88939c94e86fbdb
Merge from noexcept branch