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)
Status Job ID Name Coverage
  Build
passed #137104
docker
build_linux_27

00:19:46

passed #137105
docker
build_linux_36

00:19:36

passed #137106
macosx
build_macosx_27

00:18:18

passed #137107
macosx
build_macosx_36

00:16:38

 
  Deploy
passed #137108
deployer
deploy_beta

00:00:18