merge @eccb0fd @3f35d21 for #704
merge @eccb0fd @3f35d21 for #704

CompEvol/beast2,Anaphory/beast2,tgvaughan/beast2,Anaphory/beast2,tgvaughan/beast2,CompEvol/beast2,CompEvol/beast2,Anaphory/beast2,tgvaughan/beast2,CompEvol/beast2,Anaphory/beast2,tgvaughan/beast2