touch(1): Move ids back to the comments (as per 1de703daf6).
Merge branch 'master' into gsocdrm_merger