merged conflict
merged conflict

jameshensman/GPy,ysekky/GPy,mikecroucher/GPy,ptonner/GPy,strongh/GPy,AlexGrig/GPy,dhhjx880713/GPy,fivejjs/GPy,jameshensman/GPy,PredictiveScienceLab/GPy,ysekky/GPy,Dapid/GPy,beckdaniel/GPy,Dapid/GPy,mikecroucher/GPy,fivejjs/GPy,gusmaogabriels/GPy,beckdaniel/GPy,maaskola/GPy,TianpeiLuke/GPy,AlexGrig/GPy,ptonner/GPy,befelix/GPy,AlexGrig/GPy,esiivola/GPYgradients,jameshensman/GPy,befelix/GPy,befelix/GPy,SheffieldML/GPy,Dapid/GPy,dhhjx880713/GPy,TianpeiLuke/GPy,SheffieldML/GPy,buntyke/GPy,beckdaniel/GPy,mikecroucher/GPy,ptonner/GPy,strongh/GPy,AlexGrig/GPy,gusmaogabriels/GPy,ysekky/GPy,esiivola/GPYgradients,avehtari/GPy,beckdaniel/GPy,befelix/GPy,esiivola/GPYgradients,dhhjx880713/GPy,TianpeiLuke/GPy,buntyke/GPy,esiivola/GPYgradients,avehtari/GPy,PredictiveScienceLab/GPy,buntyke/GPy,dhhjx880713/GPy,PredictiveScienceLab/GPy,ysekky/GPy,gusmaogabriels/GPy,maaskola/GPy,maaskola/GPy,avehtari/GPy,Dapid/GPy,fivejjs/GPy,buntyke/GPy,maaskola/GPy,strongh/GPy,jameshensman/GPy,SheffieldML/GPy,avehtari/GPy,PredictiveScienceLab/GPy,mikecroucher/GPy,ptonner/GPy,SheffieldML/GPy