Commit d0b9b8bd authored Jun 25, 2018 by Andreas Klöckner

Merge branch 'back-out-conda-apple-workaround' into 'master'

Back out Apple Conda workaround from !37

See merge request !38