Merge branch 'across-dim-types-align-two' into 'master'

Stop causing DeprecationWarning about across_dim_types in align_two

See merge request !15