Merge "Put composer 2.3 in the right cpuset." into qt-dev