This issue has been merged or abandoned.