Better "matrices not aligned" message

This is numpy#4985 merged into numpy#4969.