Trunk: merge from branch 1.5 in
Trunk: merge from branch 1.5 in
danieljue/beast-mcmc,danieljue/beast-mcmc,danieljue/beast-mcmc,danieljue/beast-mcmc,evolvedmicrobe/beast-mcmc,evolvedmicrobe/beast-mcmc,evolvedmicrobe/beast-mcmc,danieljue/beast-mcmc,evolvedmicrobe/beast-mcmc,evolvedmicrobe/beast-mcmc