trunk: merge from branch 1.6
trunk: merge from branch 1.6
danieljue/beast-mcmc,danieljue/beast-mcmc,danieljue/beast-mcmc,danieljue/beast-mcmc,evolvedmicrobe/beast-mcmc,evolvedmicrobe/beast-mcmc,evolvedmicrobe/beast-mcmc,evolvedmicrobe/beast-mcmc,danieljue/beast-mcmc,evolvedmicrobe/beast-mcmc