Merge branch 'bayesian-optimization:master' into master

Author: till-m