bad git merge
bad git merge

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