Merge "People might want GROUP_CONCAT." into qt-dev