Trunk: merge issue 404 from branch 1.6
Trunk: merge issue 404 from branch 1.6
danieljue/beast-mcmc,evolvedmicrobe/beast-mcmc,evolvedmicrobe/beast-mcmc,evolvedmicrobe/beast-mcmc,danieljue/beast-mcmc,evolvedmicrobe/beast-mcmc,evolvedmicrobe/beast-mcmc,danieljue/beast-mcmc,danieljue/beast-mcmc,danieljue/beast-mcmc