Merge qgnus-0.23.