merge in changes from openseadragon:master