Merge branch 'master' into vl_bfgs

4 jobs for vl_bfgs in 7 minutes and 3 seconds