Merge branch 'develop-60-horizontal-interpolation-conservative-add-flux-flag' into 'master'

Minor fixes and new flux feature:

See merge request !78
3 jobs for master
in 36 seconds, using 0 compute credits, and was queued for 3 seconds