Merge branch 'fix-conda-recipe' into 'master'

Antecipating issue with conda-build

See merge request !8
5 jobs for master in 39 minutes and 7 seconds (queued for 44 minutes and 19 seconds)