V2.1.6 changes; handling mixtures; model.average.list fix