# HG changeset patch
# User Chris Cannam
# Date 1481111624 0
# Node ID 6f5a40419b00866b3eb5d0105df03126d3f16f92
# Parent  be5b29ce283b38e1021a29120ef28a8ffa2e48f9# Parent  558347e7e1abecf45f6368b4526ff3639c52e8ba
Merge from branch bqresample