Account for the new way shape information is kept
Merge branch 'array' of ssh://github.com/emmt/TiPi into array