Commit cbc492dd authored Jan 31, 2018 by Willi Rath

Merge branch 'develop' into 'master'

Use Parcels v1.0 conda-forge package

See merge request !66