Merge branch 'master' into xy_coords