Merged master

2 jobs for cmake_support in 22 minutes and 6 seconds (queued for 2 seconds)