# HG changeset patch
# User Chris Cannam
# Date 1481306515 0
# Node ID e939a365e4d21169464274df3e66f929854e0942
# Parent  983667969a82e28d6d1a3d45491915e5b05a9f32# Parent  ca43c4b7719c2e0bbf6b9af47a4fa48c26754fff
Merge from branch bqresample