Merge branch 'particle_container_merger' into 'master'

Implement a thread-safe particle container merger.

See merge request !994
2 jobs for master in 21 seconds (queued for 2 seconds)