erge branch 'updating_memory_performance_doc' of github.com:OceanParcels/parcels into updating_memory_performance_doc
erge branch 'updating_memory_performance_doc' of github.com:OceanParcels/parcels into updating_memory_performance_doc

OceanPARCELS/parcels,OceanPARCELS/parcels