Merge branch 'master' into line_search

4 jobs for line_search in 6 minutes and 26 seconds