Merge branch 'master' into now_DescentMinimizer_and_bugfix

4 jobs for now_DescentMinimizer_and_bugfix in 5 minutes and 42 seconds (queued for 3 minutes and 30 seconds)