Fix slow BEAUTi import of allignments
merge with trunk
typo
Merge branch 'R2.1.1'