merge with upstream/master
merge with upstream/master

jaberg/hyperopt,466152112/hyperopt,dudalev/hyperopt,w1kke/hyperopt,CVML/hyperopt,dallascard/hyperopt,mathkann/hyperopt,nicholas-leonard/hyperopt,allansp84/hyperopt,beni55/hyperopt