One extra merge conflict
One extra merge conflict

seanich/openseadragon,lidasong2014/openseadragon,shaunstanislaus/openseadragon,avandecreme/openseadragon,daverome/openseadragon,avandecreme/openseadragon,ricochet2200/openseadragon,lidasong2014/openseadragon,msalsbery/openseadragon,goofwear/openseadragon,jmnetus/openseadragon,shaunstanislaus/openseadragon,Iced-Tea/openseadragon,ricochet2200/openseadragon,daverome/openseadragon,seanich/openseadragon,LarissaSmith/openseadragon,TMUND/openseadragon,openseadragon/openseadragon,rdlester/openseadragon,msalsbery/openseadragon,LarissaSmith/openseadragon,mcanthony/openseadragon,openseadragon/openseadragon,mcanthony/openseadragon,goofwear/openseadragon,rdlester/openseadragon,jmnetus/openseadragon,TMUND/openseadragon,Iced-Tea/openseadragon