Merge branch 'master' into log_normal

4 jobs for log_normal in 4 minutes and 56 seconds