Merge branch 'develop' into 'master'

Use Parcels v1.0 conda-forge package

See merge request !66
1 job for master in 8 minutes and 29 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
canceled #1745
test

00:08:29