Merge branch 'master', remote-tracking branch 'origin'
Choose final values for the smeared optimisation approach.
Merge branch 'master', remote-tracking branch 'origin'