Merge branch 'osx-10.10' into 'master'

Update conda build config to match the defaults channel

See merge request !445
2 jobs for master in 7 minutes and 17 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #201578
docker
build_linux

00:07:17

passed #201579
macosx
build_macosx

00:04:09