Clean-up of debug output.
Merge commit '5524452c2274aafb2bd3b38b49e0a43bd24672df'

Update from subproject.