master merged into develop-QM

1 job for develop-QM
in 14 minutes and 46 seconds, using 0 compute credits, and was queued for 3 minutes and 29 seconds