Merge remote-tracking branch 'origin/master' into threadpool_task_plots2
Conflicts: src/threadpool.c More conflicts resolved as the merge point seems confused after the previous revert of threadpool_task_plot branch merge.
Conflicts: src/threadpool.c More conflicts resolved as the merge point seems confused after the previous revert of threadpool_task_plot branch merge.