Merge branch 'master' into fix_aligncrash

12 jobs for fix_aligncrash in 24 minutes and 39 seconds (queued for 1 second)