merge master

2 jobs for calvarez-master-patch-24447
in 16 seconds, using 0 compute credits, and was queued for 0 seconds